Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 08:02:46 +0000 (00:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 08:02:46 +0000 (00:02 -0800)
commit7d5ab4c649c6469adbd54e6b82ca1b3b26089a60
tree87fdd6b33b40a7dbf6ded580aa1edd5c2cec7b7e
parentfacf025cbecb653040e2b828ecfe01a4fa93eba9
parent98a012450cc51f0687ebd4f1da356d8580792712
Merge from trunk.